Revert 91b7d4c..1406090

This rolls back to commit 91b7d4c693a5bf8e6fef43ed95aa96aa1158dbec.
New changes