Revert 5bc549e..3181fd4

This rolls back to commit 5bc549e1884c122822c19f1637d7b020a3b6d88f.