Revert 94b5508..ecb0958

This rolls back to commit 94b550898ae6bedb46275ab2046ead12e6afe1b3.