Revert 1e4c94b..99a8177

This rolls back to commit 1e4c94bb4addc8a52ec864785546a5db79490817.