Revert 1a560dd..26401fa

This rolls back to commit 1a560dd15bd3214ea22ae4b69746d9f691c290cb.