Revert 34a752c..9f9613e

This rolls back to commit 34a752c35b2dee17b6390fc8a50896e61c3355e6.