Revert 26de312..54c8a7f

This rolls back to commit 26de3124a3d13dd6ecfaaf930931be5ab90479bf.
Rollback to previous commit