Revert 096477b..c34502e

This rolls back to commit 096477b4874956428c6b48ca796347d6355c3255.