Revert 1397529..276465c

This rolls back to commit 13975297a684e2a3245372f00e68ffc47612a338.