Revert 50389af..848f43c

This rolls back to commit 50389af4e442f88f2f4f8b837acd2aa547b81db7.