Revert 2dc3613..3cb01b9

This rolls back to commit 2dc3613158cb4699eb2971ad63bfb9fdb7bec605.