Revert 49e0e8e..259814c

This rolls back to commit 49e0e8e463c2ad98a01d0b450b01996ede195375.