Revert 513b8f9..911c6dd

This rolls back to commit 513b8f91250f50c9c51e08eae70657e54341184b.