Revert 15629d1..5f7c818

This rolls back to commit 15629d1ef810c7f75406000d88fa395496a09827.