Revert 07dd5cd..876d024

This rolls back to commit 07dd5cd280e7bada74f143f0adb3abc460a3c46b.