Revert 48068b6..1eacc64

This rolls back to commit 48068b6b9d5cda0d21e4683083e7fe9e852fdb47.