Revert 27ccfb4..fc99385

This rolls back to commit 27ccfb4d751063342333305b57a7ab4fdf87e474.