Revert 2b18a87..f5476c5

This rolls back to commit 2b18a873cf89d4b48782efc1c5e81e373cd9a1d6.