Revert 261263b..6b5ecd2

This rolls back to commit 261263bb2c9ef9230c9fa15c4e26996f0702d788.