Revert 7a50e7f..fed7435

This rolls back to commit 7a50e7f61e645a35db58e8019a23a933c1b9fca0.