Revert 22594bd..56be109

This rolls back to commit 22594bddc6c9219b8ea74f680f030ed136cb0d4f.