Revert 6e50cd6..99b7c80

This rolls back to commit 6e50cd6796bf950fc85e76fcdc000395f081dd56.