c836d92f9f
Rollback due to discussion on c836d92f9f. Will be looked into again later when addressing #2311.