Revert 6d0a873..9de144e

This rolls back to commit 6d0a87369dd60a83a3c64ec2029c57b4c549125d.